From 8a644e4f16d792c55df33a96eb3f22070816a67f Mon Sep 17 00:00:00 2001 From: Benjamin Otte Date: Sun, 6 Jan 2013 23:08:28 +0100 Subject: [PATCH] stylecontext: Make font hack not crash It's a lot uglier now, but it shouldn't crash anymore. We must update the font description for animations, but we can't free it on query, because some paths call gtk_style_context_get_font() twice in a row without stopping the use of the first call. So us just creating a new font description all the time and unreffing the old one is not a good idea. So we just mere the new one into the old one. https://bugzilla.gnome.org/show_bug.cgi?id=691186 --- gtk/gtkstylecontext.c | 22 +++++++++++++++++----- 1 file changed, 17 insertions(+), 5 deletions(-) diff --git a/gtk/gtkstylecontext.c b/gtk/gtkstylecontext.c index 9e6a913ccb..876105cf54 100644 --- a/gtk/gtkstylecontext.c +++ b/gtk/gtkstylecontext.c @@ -3537,7 +3537,7 @@ gtk_style_context_get_font (GtkStyleContext *context, { GtkStyleContextPrivate *priv; StyleData *data; - PangoFontDescription *description; + PangoFontDescription *description, *previous; g_return_val_if_fail (GTK_IS_STYLE_CONTEXT (context), NULL); @@ -3549,10 +3549,22 @@ gtk_style_context_get_font (GtkStyleContext *context, /* Yuck, fonts are created on-demand but we don't return a ref. * Do bad things to achieve this requirement */ gtk_style_context_get (context, state, "font", &description, NULL); - g_object_set_data_full (G_OBJECT (data->store), - "font-cache-for-get_font", - description, - (GDestroyNotify) pango_font_description_free); + + previous = g_object_get_data (G_OBJECT (data->store), "font-cache-for-get_font"); + + if (previous) + { + pango_font_description_merge (previous, description, TRUE); + pango_font_description_free (description); + description = previous; + } + else + { + g_object_set_data_full (G_OBJECT (data->store), + "font-cache-for-get_font", + description, + (GDestroyNotify) pango_font_description_free); + } return description; } -- 2.30.2